ci: Drop gpgme and libgcrypt hacks
authorJonathan Lebon <jonathan@jlebon.com>
Mon, 28 May 2018 19:22:14 +0000 (15:22 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Tue, 29 May 2018 19:24:08 +0000 (19:24 +0000)
These shouldn't be needed anymore in F28.

Closes: #1601
Approved by: cgwalters

ci/libpaprci/libbuild.sh

index 8b8af3f505d8e61a311ebfd0cd54c07386c2541b..a7c774e78e1c1d06c49eb3fd5b365037f788d530 100644 (file)
@@ -49,16 +49,6 @@ pkg_builddep() {
     # This is sadly the only case where it's a different command
     if test -x /usr/bin/dnf; then
         dnf builddep -y "$@"
-
-        # XXX: tmp hack -- see
-        # https://github.com/ostreedev/ostree/pull/1539
-        if rpm -q gpgme | grep -q gpgme-1.9.0-6.fc27; then
-            dnf install -y https://kojipkgs.fedoraproject.org//packages/gpgme/1.10.0/4.fc27/x86_64/{gpgme{,-devel},python{2,3}-gpg}-1.10.0-4.fc27.x86_64.rpm
-        fi
-        # https://bugzilla.redhat.com/show_bug.cgi?id=1542453
-        if rpm -q libgcrypt | grep -q libgcrypt-1.8.2-1.fc27; then
-            dnf install -y https://fedorapeople.org/~walters/libgcrypt-1.8.2-2.fc27.x86_64.rpm
-        fi
     else
         yum-builddep -y "$@"
     fi